Merge from emacs-24; up to r111236
authorGlenn Morris <rgm@gnu.org>
Fri, 8 Feb 2013 17:23:24 +0000 (09:23 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 8 Feb 2013 17:23:24 +0000 (09:23 -0800)
commit3e099660d9020785ee6d524fe3fa7363460194ee
tree868926ce017333e71baf7cd177e6ec4647cc421a
parentbbc8ae357a2ee311c6010532f01fe99dcb24c30f
parentff8e5790b6bd91fc99352c86fa3a16c5b069e621
Merge from emacs-24; up to r111236
doc/lispref/ChangeLog
doc/misc/ChangeLog
doc/misc/eshell.texi
etc/TODO
src/xdisp.c